Merge from emacs-24; up to r110984
authorGlenn Morris <rgm@gnu.org>
Mon, 3 Dec 2012 01:08:31 +0000 (17:08 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 3 Dec 2012 01:08:31 +0000 (17:08 -0800)
commita331ef390f9d4b5fa28934bf6c5d4ba6a42c73d3
tree66bf648ec38d0b021dfb9a871d14b7bb954a0f98
parentec5695449fbdcbd948dd8bfbd1e5aee49bac51e5
parent4aa19c9aa0b4c3ea61d948de706e18e34242beb9
Merge from emacs-24; up to r110984
16 files changed:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/elisp.texi
doc/misc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/files.el
lisp/gnus/ChangeLog
lisp/simple.el
msdos/ChangeLog
src/ChangeLog
src/data.c
src/fileio.c
src/w32.c
src/w32fns.c